Autogenerated HTML docs for v1.7.5.1-169-g505a1
diff --git a/git-svn.html b/git-svn.html index 5b8b321..e5d2f38 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -1671,10 +1671,9 @@ when committing into SVN, which can lead to merge commits reversing previous commits in SVN.</p></div> </div> -<h2 id="_design_philosophy">DESIGN PHILOSOPHY</h2> +<h2 id="_merge_tracking">MERGE TRACKING</h2> <div class="sectionbody"> -<div class="paragraph"><p>Merge tracking in Subversion is lacking and doing branched development -with Subversion can be cumbersome as a result. While <em>git svn</em> can track +<div class="paragraph"><p>While <em>git svn</em> can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that @@ -1683,15 +1682,14 @@ </div> <h2 id="_caveats">CAVEATS</h2> <div class="sectionbody"> -<div class="paragraph"><p>For the sake of simplicity and interoperating with a less-capable system -(SVN), it is recommended that all <em>git svn</em> users clone, fetch and dcommit +<div class="paragraph"><p>For the sake of simplicity and interoperating with Subversion, +it is recommended that all <em>git svn</em> users clone, fetch and dcommit directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em> operations between git repositories and branches. The recommended method of exchanging code between git branches and users is <em>git format-patch</em> and <em>git am</em>, or just 'dcommit’ing to the SVN repository.</p></div> <div class="paragraph"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you -plan to <em>dcommit</em> from. Subversion does not represent merges in any -reasonable or useful fashion; so users using Subversion cannot see any +plan to <em>dcommit</em> from because Subversion users cannot see any merges you’ve made. Furthermore, if you merge or pull from a git branch that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong branch.</p></div> @@ -1737,7 +1735,7 @@ tracked when committing to SVN. I do not plan on adding support for this as it’s quite difficult and time-consuming to get working for all the possible corner cases (git doesn’t do it, either). Committing -renamed and copied files are fully supported if they’re similar enough +renamed and copied files is fully supported if they’re similar enough for git to detect them.</p></div> </div> <h2 id="_configuration">CONFIGURATION</h2> @@ -1788,7 +1786,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-05-01 23:53:06 UTC +Last updated 2011-05-05 01:29:54 UTC </div> </div> </body>
